Minor fixes to both files