Some requirements were missing
Lint'ed

Lint is working again (no idea what fixed it), so the warnings have been
fixed up now.