everything seems to be working fine now, with these changes