Made some simple fixes