Some fixes

This is over like 10 months.