Small bug fixes to development version