Fixing more random stuff