Fixed broken references to non-existent beans