Cleanup, fixing missed merged issues