Fixes to lunacyBuild()