#403 Fix global definitions