Further fixes for pull#3