Updates for issues found while testing