More Changes to Configuration and NPE Bypass