Missed Fixes

Missed in initial commit.