Minor thingies fixed