Change a few signatures and remove a few prints