Missing stuff

Looks like some stuff were missing from the last commit