* Minor buildscript updates
* Minor codestyle fixes