Minor cleanup and correct broken mapping