preparing some fixes