Fixes regarding args