Fix broken MCPopupThumbnail nonsense; minor tweaks