More edits to common and stubs to accessors