Some changes as suggested by fellow iss folks