Compilation warnings fixed (Matevz)