Tweaky tweaky!

Some minor tweaks to fix what TLP broke!