Private item remix, other minor bug fix.