Migration fixups 

Fixed Issue #20