Various fixes for pu