Next round in fixing the what should have been fixed by the last commit