Added some fixes (linux format)