Bugfix + extended build pipeline