Drkitty maintain migrate fixes

These are the modifications I would like to make before merging https://github.com/OSU-Net/cyder/pull/48.