#531 more fixes