Fix issues Chris found