Fix issues resolved to API updates