UNO: Fixed some minor refactoring issues.