fixes for arg handling