Found some issues to change

Found some issues to change