Fixed types of a few defcustoms.