4.0: Enhance check modes