SOme fixes
SOme fixes