make check fixes