Minor fixes

A release isn't a real one without some fails :)