Last general modifications