Minor touchups to recent modules.
Land #2824, @todb-r7's small fixes for recent modules