Dependency fix, strict signed/unsigned comparison compliance