Version 2.1.6: Bugfixes