#191 and #192 Code Review Fixes