Some finetuning regarding the standby and current time available changes