Some quick animation fixes