Cleaned up a few remaining warnings, fixed a memchr/memset bug