Add stubs for missing functionality
Minor fixups missing from initial commit
Added missing dependency