some bug fixes due to the relocation