Fixes for  #18.