Various entity fixes