Minor details on several functions