fixed compilation errors left from v1.4.0 merge