Got rid of warnings +