fix couple of issues