Fix takeover-fun's bugs