Fixed issues with first/last room map values