- Fixed build errors and warnings