Improve some static loading