Fixes for PE3.3.