Reduce warnings

Moving forward to green waterfall.