A few warnings resolved. (TODO: Take care of deprecated methods)