Trevor's fixes.