Testing fixes - Thursday night.