Fixing 508 compliance issues