Style updates for issues reported by Client