Fixed some warnings once again