Bypass + message fixes