some geraet fixes