Minor offline updates (closes #4756, closes #4757)