Bug fixes for 0.6.1