Fixed 2 things