wsaqaf Updates and fixes