Build and Lakka fixes