Fixing check() warnings