Removed more calls to mat()