Fixes and junk form the Glorious Leader