Fixed 2 small issues