Eliminate almost all warnings from first map