Finalize fixes, fill in remaining stubs.