SimpleStack Fixes migration

Here are the quick fixes present in SimpleStack