Fixed missing mangle and rand moving to its own crate