Adaptive fixes #2