Got rid off some warnings