All kinds of fixes!