Fixes to PUNQ Model