Fix build errors due to marco changes in f4cfaf3