Fix rest of the modifications