More LCD Tweaks

Fixes some issues introduced in last commit