Some prefix mapping fixes