Fix up some issues with check-in from one machine to the next