A lot of fixes!