Fixes missed in last commit