Remove map type + fix some validators