minor bugfixes in mason plugin