all local modifications to fix compile errors