Hotfixes on buggy quest