Fixed build failing issues