AutoforwardSpec fixes