Fixes for the previous pull