Checked out fixes