- build system fixes and spec cleanup