Moar fixes. Now it works.