Minor fixes to dependencies and requires.