Fixes for ps
merging