fixed some hibernate mappings