Fix last issues in base.common