Couple of tweaks to new lockrow stuff