diff --git a/desktop/desktop_aux.s b/desktop/desktop_aux.s
index ebe80e7..d2f743e 100644
--- a/desktop/desktop_aux.s
+++ b/desktop/desktop_aux.s
@@ -3768,5 +3768,7 @@ addr:   .addr   0
 .endproc
 
         .assert * = $BFFC, error, "Segment length mismatch"
+
         PAD_TO $C000
+
 .endproc ; desktop_aux
diff --git a/desktop/desktop_lc.s b/desktop/desktop_lc.s
index e7e69b6..e3bc05c 100644
--- a/desktop/desktop_lc.s
+++ b/desktop/desktop_lc.s
@@ -260,6 +260,5 @@ op:     lda     dummy1234
 
         .include "desktop_res.s"
 
-
         .assert * = $FFBA, error, "Segment length mismatch"
         PAD_TO $10000
diff --git a/desktop/invoker.s b/desktop/invoker.s
index 7055fd7..a538f8f 100644
--- a/desktop/invoker.s
+++ b/desktop/invoker.s
@@ -172,5 +172,6 @@ update_bitmap:
 exit:   rts
 
         ;; Pad to $160 bytes
-        .res    $160 - (* - start), 0
+        PAD_TO $3F0
+
 .endproc ; invoker
diff --git a/desktop/ovl1.s b/desktop/ovl1.s
index 84ece92..a4647d1 100644
--- a/desktop/ovl1.s
+++ b/desktop/ovl1.s
@@ -105,4 +105,5 @@ self:   bne     self            ; hang on error?
 ;;; ============================================================
 
         PAD_TO $A00
+
 .endproc ; disk_copy_overlay
\ No newline at end of file
diff --git a/desktop/ovl1a.s b/desktop/ovl1a.s
index 7c747b2..431dc05 100644
--- a/desktop/ovl1a.s
+++ b/desktop/ovl1a.s
@@ -141,4 +141,5 @@ self:   bne     self            ; hang if fails
 ;;; ============================================================
 
         PAD_TO $1A00
+
 .endproc ; disk_copy_overlay2
\ No newline at end of file
diff --git a/desktop/ovl1b.s b/desktop/ovl1b.s
index 783d723..40ca2c7 100644
--- a/desktop/ovl1b.s
+++ b/desktop/ovl1b.s
@@ -827,8 +827,8 @@ LD9C1:  .addr   $0C83
         .addr   $0C83
         .addr   $0C83
         .addr   $0C84
-        .addr   $DA3C
-        .addr   $DA77
+        .addr   LDA3C
+        .addr   LDA77
 
 LD9D1:  .byte   0, $A, $C, $10
 
@@ -872,7 +872,8 @@ LDA35:  tsx
         stx     LD00B
         jump_addr := *+1
         jmp     dummy1234
-        lda     LD451
+
+LDA3C:  lda     LD451
         bne     LDA42
         rts
 
@@ -891,7 +892,7 @@ LDA42:  lda     #$00
         addr_call LE0B4, str_quick_copy_padded
         rts
 
-        lda     LD451
+LDA77:  lda     LD451
         beq     LDA7D
         rts
 
@@ -1989,12 +1990,8 @@ LE522:  lda     winfo_dialog::window_id
         jsr     LDEEB
         rts
 
-LE550:  .byte   $07
-        asl     $05
-        .byte   $04
-        .byte   $03
-        .byte   $02
-        ora     ($0000,x)
+LE550:  .byte   7,6,5,4,3,2,1,0
+
 LE558:  .byte   0
 LE559:  lda     winfo_dialog::window_id
         jsr     LE137
@@ -2914,27 +2911,37 @@ LF1CC:  cmp     #$03
         jsr     disk_copy_overlay4::L127E
 LF1D7:  rts
 
+;;; ============================================================
+
+;;; Padding ???
+
+.scope
         tya
         lsr     a
-        bcs     LF1DF
+        bcs     :+
         bit     $C055
-LF1DF:  tay
+:       tay
         lda     ($28),y
         pha
         cmp     #$E0
-        bcc     LF1E9
+        bcc     :+
         sbc     #$20
-LF1E9:  and     #$3F
+:       and     #$3F
         sta     ($28),y
         lda     $C000
-        bmi     LF1F5
+        bmi     :+
         jmp     L51ED
 
-LF1F5:  pla
+:       pla
         sta     ($28),y
         bit     $C054
         lda     $C000
         .byte   $2C
         .byte   $10
+.endscope
 
-.endproc
\ No newline at end of file
+;;; ============================================================
+
+        PAD_TO $F200
+
+.endproc
diff --git a/desktop/ovl1c.s b/desktop/ovl1c.s
index 37ef748..29fd643 100644
--- a/desktop/ovl1c.s
+++ b/desktop/ovl1c.s
@@ -1461,18 +1461,16 @@ L12B9:  .byte   0
         .byte   $7F
         .byte   $FF
 
-L12DA:  lda     $D133
-        cmp     $D18D
-        bne     :+
-        jmp     disk_copy_overlay3::LDAEE
-:       cmp     $D1C7
-        bne     :+
-        jmp     disk_copy_overlay3::LDB55
-:       rts
+;;; ============================================================
 
-        lda     $D18D
-        sta     $D12D
-        jsr     disk_copy_overlay3::LE137
-        yax_call disk_copy_overlay3::MGTK_RELAY2, MGTK::ScreenToWindow, $D12D
+;;; Padding: this is a random chunk of overlay part 2 ($DADA)
+
+        .byte   $AD, $33, $D1, $CD, $8D, $D1, $D0, $03
+        .byte   $4C, $EE, $DA, $CD, $C7, $D1, $D0, $03
+        .byte   $4C, $55, $DB, $60, $AD, $8D, $D1, $8D
+        .byte   $2D, $D1, $20, $37, $E1, $A0, $46, $A9
+        .byte   $2D, $A2, $D1, $20, $E0, $DB
+
+        .assert * = $1300, error, "Segment length mismatch"
 
 .endproc
diff --git a/desktop/ovl2.s b/desktop/ovl2.s
index 3e7e77a..8700cc9 100644
--- a/desktop/ovl2.s
+++ b/desktop/ovl2.s
@@ -1546,4 +1546,5 @@ L1A6D:  lda     on_line_params::unit_num
 ;;; ============================================================
 
         PAD_TO $1C00
+
 .endproc ; format_erase_overlay
diff --git a/desktop/ovl3.s b/desktop/ovl3.s
index ec07eea..c31ffde 100644
--- a/desktop/ovl3.s
+++ b/desktop/ovl3.s
@@ -1529,4 +1529,5 @@ L9EC1:  .byte   0
 ;;; ============================================================
 
         PAD_TO $A000
+
 .endproc ; selector_overlay2
diff --git a/desktop/ovl4.s b/desktop/ovl4.s
index 67255be..4b4d27c 100644
--- a/desktop/ovl4.s
+++ b/desktop/ovl4.s
@@ -3003,4 +3003,5 @@ L6F3D:  .byte   0
 ;;; ============================================================
 
         PAD_TO $7000
+
 .endproc ; common_overlay
diff --git a/desktop/ovl5.s b/desktop/ovl5.s
index 495adf7..77b9061 100644
--- a/desktop/ovl5.s
+++ b/desktop/ovl5.s
@@ -260,4 +260,5 @@ L7295:  rts
 ;;; ============================================================
 
         PAD_TO $7800
+
 .endproc ; file_copy_overlay
diff --git a/desktop/ovl6.s b/desktop/ovl6.s
index cc303e7..c85e29d 100644
--- a/desktop/ovl6.s
+++ b/desktop/ovl6.s
@@ -96,4 +96,4 @@ L70EA:  MGTK_RELAY_CALL MGTK::CloseWindow, winfo_entrydlg_file_picker
 ;;; ============================================================
 
         PAD_TO $7800
-.endproc ; file_delete_overlay
\ No newline at end of file
+.endproc ; file_delete_overlay