Lapis and fixes