Some smaller fixes I've been shelving so far

The only "risk" lies in:
 - https://hibernate.atlassian.net/browse/HSEARCH-1371

would like to use it in the first Alpha tag so that we can verify the release process early on