Minor changes to fit actual production server output