Little fixes

interaction with map