Fix private variables