Fix some issues with drawing and moving Info points