Some more fixes. Now time to migrate to local server and add fixes.
Some more fixes. Now time to migrate to local server and add fixes.

dilawar/ncbs-hippo,dilawar/ncbs-minion,dilawar/ncbs-hippo,dilawar/ncbs-minion,dilawar/ncbs-hippo,dilawar/ncbs-hippo,dilawar/ncbs-minion,dilawar/ncbs-minion,dilawar/ncbs-minion,dilawar/ncbs-hippo