more wporg fixes