Code Review 1 Fixes