Warning Improvements