Fixed minor bugs with static arguments