Fixing some small issues found during testing