disign + hibernate fixes