Various cleanups for mesh display