Fixing @SafeVarargs and such