Minor Fixes

Fixed potential logical issues and removed a couple of unused use statements.