Fixing markding warning notices