Fix forgotten private variables
Work in progress