Address warnings; fix #29.