More bugs in WPSynthesizer fixed