more fixes on hibernate mapping