Did some changes to remove remaining waring messages.