Resolved warnings (included deprecated method)