PROLOGUE fixes

This fixes several problems when using `PROLOGUE`.