Extend build scripts a bit
Fix build