Fixed even more warnings