Finalised fixes