Proper Fixes for #1478