Fixing more static issues.