Various modified for MATE compatiblity