Fix instance vars