Minor fixies on variables

1 job for master in 0 seconds (queued for 11 seconds)