Various fixes
forgot that