Ivan proposed fixes, part one