Fix notices from last PR

Resolve #12