Hotfixes for 0.1.0 - ready to release