Final fixes for 0.0.6.