Fixing assembly issues