Removing compiler warnings due to deprecations