Fixing stuff, this time for real

Ugh, did I just forget about backward compatibility? Why, yes I did.