WIP: more fixes to shared chore stuff
Further unbreaking of sharedness