Some fixes...

to the building files