Fixing smaller issues