#9 more fixes