Little fixes
Little fixes