Got rid of a load of reflection warnings