Fixat lite errors
merge