Quick fixes for @since and array_combine error