Fixing check() warnings

/cc @xsaintmleux