More Fixes for #1325