Correcting paths and generally getting things working again