Fixed 2 small bugs