Buildfile fixes
WUT AM I DERPING :-p