More prefix mapping fixes