fixing couple of issues