Fix diffs
Better guarding