Fix getter functions.