Fixes missed in code update