Fixing some uses of `notImplemented`