For #256 correct some more direct bean references