Client config cleanup

Fixed arguments issues