Bugfix and test build