Overseer and Overlord fixes