Fixing more random things