Quick additions/fixes to included files.