Fixes from wilson
tree61b0c82db6bd9246dd5a44e8d0964c2c610ee905
drwxr-xr-x - gcc