Fixing some static