Slight fixes to prior commit