Fixing missing parts

Looks like I missed a few things when I resolved the merge conflicts
restored the missing parts.