Fix some string formatting