Apply @mixonic comments