build system fixing still