Several little adjustment