Universal Power: Small fixes

Small fixes