Some old fixes before branching