(Lakka) Coding standard compliance fixes