Some fix to comply to new bertos version.