nii - more fixes to get GA up and running