Updating to ORM 4.3 and some minor improvements