Some format-fixes