Various fixes after laser cutting first pieces