Location correction and generic exports