VROOZI-556: Fix multiple issues