Fixed issues from insights #8