Fixes, Tweaks

I will probably update the live system to 3.42 tomorrow unless anybody finds any problems.