Some smaller fixes I've been shelving so far


The only "risk" lies in:
 - https://hibernate.atlassian.net/browse/HSEARCH-1371