Minor improvements on Animation module.