Misc. changes for Kay.