[z2652] Additional improvements to Uldaman

(based on commit d0030bb)

Signed-off-by: Xfurry <xfurry@scriptdev2.com>

(based on commit SD2-TBC[s2699] - c6b327b)

Signed-off-by: Xfurry <xfurry@scriptdev2.com>