Whistle: more fixes