Fixed some warning(s)