Fixes from Code Review