End To End - Fixed some warnings.