Map composer tool fixes