Bugfixes and updates for 1.3.9