Additional fixes for hibernate proxy issue