Fixed some more maple & opera issue