Small define changes