fixed compilation errors on prev commit