Fixed problems that I created