Adding various fixes for tomorrow