copule of fixes