Additional Fixes for #104