proper build system and fix injection