Fixed the getters for some properties to propagate the changes