More space fixes.
Updated mkmk.