Fix newly merged print statements
Fix rebase issues