GAMMA: minor improvements.