Misc restoration

Restores a couple of things that were missed in the bay synch