All the fixes