One more fixes for #19