Fixes some calls to empty lib::functions, references #310