Small constructor changes