* More minor fixes