Formated fixes