A couple more NAG bugfixes