bugfix sources & build configuration changes