Build fixes.

* Never built a complete image from the IMAP branch before.