Initial minor modifications