Small changes to try and remove printing bugs