Made a few minor fixes