Small fixes yet again