Hotfixes and basic features