Fixed various assembly issues