Hotfixes and user contributions by Klem