small bug fixes with changed api