Maya ???? bug fix and cross platform improvement