DAR-826: general cleanup and fixes for any solution.