Maximus: Some cleanups and bug fixes