Slxu fix and improve deployment

Yes, I've already another commit fixed all these. I thought I've pushed it in this branch. I'll find it out and push it here.