Fixes once more to help display