Patches for 0.1-beta