Finalised packaging improvements.