Last edits before switching to 1.4