Pre-release fixes and improvements