fixes for kwargs