Fix some getter