Animatable fixes