Fix few issues for https dump