Tuesday fix to issues