Minor fixes everywhere