The changes to be made are now on lines 118 and 146 respectively.
If you find the time, it would be nice if you can edit that post I quoted with the correct information. I will then edit my quote of your post as well. But it isn't really that important since you can always find the correct line with a CTRL+F search for the right string. Did anything else change or is that it?