Fix DevMode