removed even more warnings