Small morning fixes based on error logs