More minor fixex