More fixes to prevent error log spam.