Minor fixes here, there, everywhere