Fixes all changes