Added Migration Warning message

Minor fixes and tweaks