Further fixes after merge for #19