Fixes for CC0016 and CC0031

Related to #152.