Additional Bug fixes for #193