Lunera: Some bug fixes

Some bugs have been fixed.