Fix some functions up such that they use govagrant