Animation support fixes

@jbeezley Can you check that this fixes your issue?