Some minor fixes an updates