Another part of fixes