Reworked op factories
Fixed issues