:), That one I forgot, code review matters :D.
I will be commiting the fixes after the issue with your last changes this afternoon.