Make assembly clearer and add slight build improvements