A Few Adjustments Due to API Changes