Datatypes and other tweaks