1. Fixed build errors