Better Fixes for #1486