Fix several minor issues for Ulli