Bugfixes to monad construction checks