0.4.6: Several bugfixes