I'll change the exit. I will check the other two points, but I am pretty sure it's ok and no warning is needed. I also should use the new define for 101 here again.