More -Wconversion fixes, default switch entries