Fixes for class member variables