Small bug fixes for version 2.05