First round of fixes furing PR review