Fixed build problems with APIv19