#271 more fixes