Fixing some 3.0 merge shits