fixes for morning issues