When my WP was cancelled some 6 years ago now, I went to immigration the next day to change from Non Imm B to O on retirement. I had a warning so all my documents were correct. Nevertheless I was charged 2 days ov erstay - the day my WP was cancelled and the next day when I went to Imm. Go figure! Just a heads up.