Various fixes

Bloatless x1000