String Formatting Fixes