misc format fixes