Adaptive design fixes