Form and rate fixes