Fix concerns