Fixing additional incompatible API usage