Fix couple of issues