Updates to JANSI handling