Fixed more private variables and functions