Whoops a few more static calls should be fixed...