Fixed couple of issues