More mapfixes.

This is exceedingly frusterating. Hopefully it worked properly this time.

Fixed issues with cryobags on master.

Signed-off-by: Jamini <mobiousjami@gmail.com>