Fixing some...stuff