A collection of fixes