various fixes needed to make it work live