MUS-102: Fixed some Lint issues