SCM: fix compile errors