[NOJIRA] Fixes based on code review comments.