Fixes mistakes while rebasing