Some very quick fixes