various fixes for bigproduct and dev area