Fixes & Improvements after testing in Acceptance env