Avoid notification when not available (under 10.7).
Some cosmetical changes.