Fix some inconsistencies in the build.
Merge branch 'mode'
Separate target for mode zipping.