fixes for pid
merge