final bugfixes for stable release