Fixes, build system