Fixing random stuff