Fixes in product and application