More PTRLV bux fixes