randon fixes