Few fixes + updates