Small additions, just in case I pick this up offsite.