Fixes for 0.9