warning fix

Fixed several issues