Fixes to statics