Made a few fixes