Improvements. Fix Warnings