Minor fixes to big-map