Fix compile errors caused by last commit