Fixed various requirement bugs