Fixed build stuff