Some cleanup - fixed tablespace path regression.