Further changes for nitro compatibility