OGM-605 Minor fixes

@emmanuelbernard 
A few minor changes I would apply for https://github.com/hibernate/hibernate-ogm/pull/433