Small changes to lakka

Just some things that make it slightly more robust.