Small changes to assembly