Fixed animation etc.