trog's fixes