iFix more warnings