Last second fixes

I hope