Added Mel's fixes