A number of fixes