* Fixing warnings