Proper Fixes for #1478
Costemic, no functional change