More Section 508 compatibility issues fixex.