Peters other fixes