Sonia - resolving minor issues