hotfixing a couple issues