Fixed 2 minor bugs