Fixing some issues pointed out in QA with config and t calls