Minor fixes for PU-branch