Add some static and #ifdef DEVELOPER