All kinds of fixes