Fixed small bugs in build configuration