G000568 (fixes #356), S001191 fixed selectors, M001143 fixes