Fix 'static problem.
Add fixes for statics.