Fixing improper requires