Heimdal portability cleanups