Some more fixes and now will need to consult with Tom on this.