first phase of fixes