[TW318] - Some minor changes