Bugfix & working build process