Minor working changes