Fixes for parse multiple