Fixing some stuff I broke