updates from jibbius to work with wp 3.5