Fixing things for DI, + comments from PR