Various fixes.

Based on the communication with PM last night.