minor assemble setup tweaks