Small coding fixes

Nothing  major