fix to wp issues