More minor fixes (From aland)