Code Review Fixes