More bugfixes and testing (2.0.11.255)