Fixed string formatting issues