Fix the build + 2 minor fixes

Fixed, I pasted the code to a wrong location when re-adding MainTBar