Cleanups and warnings fixes
conduit-based implementation