Fix breaks from cleanup