Fixes to 0.6