Minor fix
More minor fixes