Fixes for 0.6.5 changes.