Bugs/compiler warnings

This changeset removes the compiler warnings I introduced in #164