Warnings, Redux

Fixed the warnings enabled in #227.