Various bits and pieces I've updated via modifying TAO.