some bugfixes for 0.9.2-dev