* Nits from PR #936 * Suggested (broken) changes for discussion * Fixes for Codec errors * Removed unused imports