Cup and Tee bug fixes