Minor fixes from merged migration