Minor fixes and release preparation