small changes related to wp-1490