Fix static calls and config access.