Many different fixes!