some bugfixes after merging 1.2.1.1 to stable trunk