Small additions to remove compilation errors.