Fixing build system issues