Fixes after previous pull request