Fixed several issues encountered during assembly