More fixes for laser eyes