Fix requires and variables