[BUGFIX] Minor warnings