some autoadd fixes