Various changes & fixes

Checklist by Cesar's email message