Some format fixes