Hopefully got rid of more warnings