minorer fixes