various animation system hacks (needs cleanup)