Fix issues in lock queue and portlogger