Random UCP fixes

Signed-off-by: Tyloo <jbonva@gmail.com>