Fixing more goofiness