fixing exports and offsets