Correct static references