Fixed build system problems