Warning fixes

Fixes for #87 and #86