Fix up Sykes and add Trip30