Relocate some functions