Various minors fixes.
Just a quick change to allow tukui to run on 5.3. Still investigating for more changes and things broken.
Forgot to update toc.
not needed anymore
15.58
Merge remote-tracking branch 'tukz/master'