Fixing some issues raised in review