Small fixes here and there which I forgot