Fix a few errors in the npytypes py3k "fixes"