Several bugfixes to 0.3e release.