Validation against SI/SO/PI/PO on save, minor fixes