Some old fixes...