Fix warning & error