Some 'final' fixes