Fixing several issues. References: ATLASDBE-223, ATLASDBE-222, ATLASDBE-221, ATLASDBE-220, ADTCC-124.