Fixes to previous pull