Bug fixes for 0.2