Fixed some modifier checks
Merge origin/master