Thanks, Kingswood. Both situations are now fixed.