System.data wp fixes