#18 more fixes