Fix build dir
Misc