Fix warning and fix missing expression data