Small changes to comply with wp 3.9