Avoided some warnings...