Fix more elkscmd compilation errors