Fixes to asg3