Added build system fixes #3