slight fixes all around