error/warning fix