Minor fixes, bump for release