Add missing files and fix problems

This refs #5396