Even more fixes for disp.py