Fixed once again some more warnings