Added missing LSB tags and overrides.
Merge pull request #989 from Gerjo/master

Added missing LSB tags and overrides. Thanks @Gerjo for the enhancement.