The first part of fixes ;-)