[206] Warning & Remark Fixes