Fixed args in debug call stack

Signed-off-by: Tom Wright <tom@inflatablecookie.com>
Updated form dependency handling

Signed-off-by: Tom Wright <tom@inflatablecookie.com>