Some Additional fixes