(Lakka) Style nits and update headers