more checked mode fixes