Fix objectify issues