Continued pre-release bug fixes