Both issues sorted. I will leave it a couple of days in case anyone finds other issues and will upload again Wednesday.
