Misc. fixes
Merge branch 'spring-data'