Fixes for 0.5