Fix some stuff that should have been static for safety.