Fixed build-failing issues