Feature/revamp params

A couple of small fixes for things I broke when revamping -D support :(