fixes that turned out permanent