minor fixes on initialization