Made BlockManager not a singleton, Fixes #763