Fixed isses with safe values.