Introduce various fixes, run end-to-end