Fixes for 0.9.1