Importing fixes from nzamps