fixes for pp machines